volume: Fix initial visibility of input

Currently the visibility of input volume is only updated when a stream
is added/removed - apparently no one noticed until now, as in the normal
user session we get away with this as long as we have some startup sound,
but this is not the case in the lock screen, so we may end up showing
input volume incorrectly.

https://bugzilla.gnome.org/show_bug.cgi?id=684611

diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index e96b65cb41419a38b2f88f8c828294affc442fc7..7f91e66940672a7fe5a2bebe8c00cd09a9890748 100644 (file)
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -63,10 +63,7 @@ const VolumeMenu = new Lang.Class({
         this.addMenuItem(this._inputTitle);
         this.addMenuItem(this._inputSlider);
 
-        if (this._control.get_state() == Gvc.MixerControlState.READY) {
-            this._readOutput();
-            this._readInput();
-        }
+        this._onControlStateChanged();
     },
 
     scroll: function(direction) {
@@ -95,6 +92,7 @@ const VolumeMenu = new Lang.Class({
         if (this._control.get_state() == Gvc.MixerControlState.READY) {
             this._readOutput();
             this._readInput();
+            this._maybeShowInput();
         } else {
             this.emit('icon-changed', null);
         }